[SOLARIS] A couple of small fixes to the Makefiles for the kernel tool headers.

Signed-off-by: John Levon <john.levon@sun.com>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index bb6cdaf2869f2013759309e582e3989b050fff0a..64be0322417e2ea201a49739552daa897761d605 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -25,9 +25,9 @@ CFLAGS += -D__XEN_TOOLS__
 %.o: %.cc
        $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-OS = $(shell uname -s)
+.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS)
 
-.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(OS)
+mk-symlinks-SunOS:
 
 mk-symlinks-Linux: LINUX_ROOT=$(XEN_ROOT)/linux-2.6-xen-sparse
 mk-symlinks-Linux:
@@ -44,4 +44,4 @@ mk-symlinks-xen:
        mkdir -p xen/io
        ( cd xen/io && ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . )
 
-mk-symlinks: mk-symlinks-xen mk-symlinks-$(OS)
+mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS)

diff --git a/tools/guest-headers/Makefile b/tools/guest-headers/Makefile
index dc1456667f75c5439a73eff92ef4030c3deaedeb..1c50599a4c273ab2c51cae88bfb03de19cc168c7 100644 (file)
--- a/tools/guest-headers/Makefile
+++ b/tools/guest-headers/Makefile
@@ -1,5 +1,6 @@
-
 XEN_ROOT=../..
+include $(XEN_ROOT)/tools/Rules.mk
+
 linuxsparsetree = $(XEN_ROOT)/linux-2.6-xen-sparse
 
 .PHONY: all
@@ -8,10 +9,15 @@ all:
 .PHONY: check
 check:
 
-.PHONY: install
-install:
+.PHONY: install install-Linux install-SunOS
+
+install-Linux:
        mkdir -p $(DESTDIR)/usr/include/xen/linux
        install -m0644 $(linuxsparsetree)/include/xen/public/*.h $(DESTDIR)/usr/include/xen/linux
 
+install-SunOS:
+
+install: install-$(XEN_OS)
+
 .PHONY: clean
 clean:

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 772a2a8cf8b1a5184ebb2611cc50553e4f664647..ff5e45fe2c3e732e4869d66c2bb3725deb5ac2a6 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -29,7 +29,7 @@ XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored
 
 XENSTORED_Linux = xenstored_linux.o
 
-XENSTORED_OBJS += $(XENSTORED_$(OS))
+XENSTORED_OBJS += $(XENSTORED_$(XEN_OS))
 
 .PHONY: all
 all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls